am 7722b766: (-s ours) am 5ec7bda1: am 40b67a0e: Merge 8aafafe4

* commit '7722b76683a8d35672a5b41b036810178fb65ebf':
  Fixed crash and 64-bit porting issues