Merge branch feature/jorgen.lind/vs_2015_build_fix with refs/heads/master into...

Merge branch feature/jorgen.lind/vs_2015_build_fix with refs/heads/master into refs/merge-requests/537/train