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

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