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

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