Incorrect build paths.  Corrected for 64 bit
Merge remote-tracking branch 'remotes/giz/master' into mergeall2