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

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