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

Merge branch feature/jorgen.lind/toolsclidoc with refs/heads/master into refs/merge-requests/245/train
3 jobs for !245 with feature/jorgen.lind/toolsclidoc into master in 6 minutes and 19 seconds (queued for 3 seconds)
merge train