Merge branch feature/jorgen/python_test with refs/heads/master into refs/merge-requests/21/train

3 jobs for !21 with feature/jorgen/python_test into master in 7 minutes and 17 seconds
merge train