Merge branch 'Fix_VS2103' into 'master'

Fixes VS 2013 Builds.

Fixes VS 2013 Builds.
Please don't directly use master!

See merge request !17
7 jobs for master in 6 minutes and 41 seconds