am 5ec7bda1: am 40b67a0e: Merge 8aafafe4

* commit '5ec7bda1f5686f8ce0236569931d2b881252f4fe':
  Fixed crash and 64-bit porting issues