Merge branch feature/morten.ofstad/MetadataUpdates with refs/heads/master into...

Merge branch feature/morten.ofstad/MetadataUpdates with refs/heads/master into refs/merge-requests/129/train
3 jobs for !129 with feature/morten.ofstad/MetadataUpdates into master in 8 minutes and 31 seconds
merge train