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

Merge branch feature/jorgen.lind/VS2015_buildfix_master with refs/merge-requests/506/train into refs/merge-requests/509/train
3 jobs for !509 with feature/jorgen.lind/VS2015_buildfix_master into master in 18 minutes and 36 seconds (queued for 7 seconds)
merge train
Name Stage Failure
failed
compile-merge-request Build
cache miss                             7
cache hit rate 99.18 %
called for link 39
called for preprocessing 6
cleanups performed 0
files in cache 3230
cache size 297.7 MB
max cache size 5.0 GB
ERROR: Job failed: exit code 1