Improve compatibility with C++11 (Visual Studio 2012, Intel C++ compiler 13.0)
Merge pull request #2647 from Karlson2k/C++11_compat_01

Improve compatibility with C++11 (Visual Studio 2012, Intel Compiler 13.0)