Merge branch feature/jorgen.lind/bug_fixes with refs/heads/master into...

Merge branch feature/jorgen.lind/bug_fixes with refs/heads/master into refs/merge-requests/249/train
3 jobs for !249 with feature/jorgen.lind/bug_fixes into master in 6 minutes and 2 seconds (queued for 2 seconds)
merge train