Prevent warning when NOMINMAX is already defined
Merge branch 'release'