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

3 jobs for !233 with feature/jorgen.lind/pytest into master in 5 minutes and 39 seconds (queued for 1 second)
merge train