Merge branch feature/morten.ofstad/FixDoxygenWarnings with refs/heads/master...

Merge branch feature/morten.ofstad/FixDoxygenWarnings with refs/heads/master into refs/merge-requests/135/train
3 jobs for !135 with feature/morten.ofstad/FixDoxygenWarnings into master in 3 minutes (queued for 1 second)
merge train