Build for core2 architecture

... avoid processor architecture issues with the binaries we distribute
Merge remote-tracking branch 'upstream/master' into fish