am 076018ad: Merge "x64 goodness."

* commit '076018addcb0f27d1a4ed9d1967a28bd5fb21230':
  x64 goodness.