Ready for 1.2.0 tag
Yet another fix for MSVC