Use the NOMINMAX workaround on Windows
Merge remote-tracking branch 'sabel83/master'