Fix builds for MSVC 2003 (#4761)
Merge pull request #4762 from szekerest/master

Fix builds for MSVC 2003 (#4761)