am 79027f62: Merge "Fix 64 bit build"

* commit '79027f6204f77db4ba3bd3ceab1f07240fbbfdb3':
  Fix 64 bit build