Merge branch feature/jorgen.lind/ImproveErrorHandling with refs/heads/master...

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