Merge branch feature/jorgen.lind/remove_swap_file with refs/heads/master into...

Merge branch feature/jorgen.lind/remove_swap_file with refs/heads/master into refs/merge-requests/320/train
3 jobs for !320 with feature/jorgen.lind/remove_swap_file into master in 17 minutes and 34 seconds (queued for 3 seconds)
merge train