Merge pull request #743 from peastman/master

Prevent running tests on unsupported CPUs
Merge pull request #744 from peastman/master

Workaround for compiler bug in Visual Studio