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

3 jobs for !109 with feature/jorgen.lind/fix2015 into master in 2 minutes and 51 seconds (queued for 2 seconds)
merge train