Merge branch feature/jorgen.lind/VS2015_buildfix_2_1 with...

Merge branch feature/jorgen.lind/VS2015_buildfix_2_1 with refs/merge-requests/507/train into refs/merge-requests/508/train
3 jobs for !508 with feature/jorgen.lind/VS2015_buildfix_2_1 into 2.1 in 51 minutes and 32 seconds (queued for 2 seconds)
merge train