am 2585148b: am 076018ad: Merge "x64 goodness."

* commit '2585148b4493d9dde62cd6389208e93ae7bc1be9':
  x64 goodness.