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

Merge branch feature/jorgen.lind/tools_fixup with refs/heads/master into refs/merge-requests/242/train
3 jobs for !242 with feature/jorgen.lind/tools_fixup into master in 5 minutes and 56 seconds (queued for 2 seconds)
merge train