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

Merge branch feature/jorgen.lind/gs_fixups with refs/heads/master into refs/merge-requests/173/train
3 jobs for !173 with feature/jorgen.lind/gs_fixups into master in 5 minutes and 10 seconds (queued for 1 second)
merge train