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

Merge branch feature/morten.ofstad/FixOptionalHeader with refs/heads/master into refs/merge-requests/390/train
3 jobs for !390 with feature/morten.ofstad/FixOptionalHeader into master in 20 minutes and 53 seconds (queued for 2 seconds)
merge train