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
Merge branch feature/jorgen.lind/VS2015_buildfix_2_1 with refs/merge-requests/507/train into refs/merge-requests/508/train