Fixed x64 build directory
Merge remote-tracking branch 'remotes/giz/master' into mergeall2