Fix Makefile.linux64
Merge remote-tracking branch 'upstream/master'