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

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