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

Merge branch feature/jorgen.lind/doc_year_version with refs/heads/master into refs/merge-requests/410/train
3 jobs for !410 with feature/jorgen.lind/doc_year_version into master in 24 minutes and 10 seconds (queued for 2 seconds)
merge train