Merge branch feature/jorgen.lind/vs_2015_2.1 with refs/heads/2.1 into refs/merge-requests/511/train

3 jobs for !511 with feature/jorgen.lind/vs_2015_2.1 into 2.1 in 19 minutes and 20 seconds (queued for 6 seconds)
merge train