Fixed compilation error on Windows
Merge branch 'master' of https://github.com/peastman/openmm