am 40b67a0e: Merge 8aafafe4

* commit '40b67a0eb0ae7c612dd30611121cf3c655c49793':
  Fixed crash and 64-bit porting issues