Merge branch feature/jorgen.lind/pytest with refs/heads/master into refs/merge-requests/389/train

3 jobs for !389 with feature/jorgen.lind/pytest into master in 24 minutes and 18 seconds
merge train