Merge branch feature/jorgen.lind/update_2.1_setup.py with refs/heads/2.1 into...

Merge branch feature/jorgen.lind/update_2.1_setup.py with refs/heads/2.1 into refs/merge-requests/467/train
3 jobs for !467 with feature/jorgen.lind/update_2.1_setup.py into 2.1 in 42 minutes and 10 seconds (queued for 1 minute and 46 seconds)
merge train