fix x64 build
Merge branch 'master' into far3

* master:
  fix x64 build