MSVC doesn't like modern code neither
Merge pull request #2078 from linquize/msvc

MSVC doesn't like modern code neither