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

Merge branch feature/jorgen.lind/python_upload_error with refs/heads/master into refs/merge-requests/479/train
3 jobs for !479 with feature/jorgen.lind/python_upload_error into master in 28 minutes and 53 seconds (queued for 4 minutes and 8 seconds)
merge train