do not check certain features on non-64 systems
Merge remote-tracking branch 'upstream/master'