Merge branch feature/jorgen/update_aws with refs/heads/master into refs/merge-requests/281/train

3 jobs for !281 with feature/jorgen/update_aws into master in 8 minutes and 5 seconds (queued for 1 second)
merge train