Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp

#1595: fix compiler error with Visual Studio 2017 on Win10 JP.