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

Merge branch feature/morten.ofstad/UpdateMetadataAPI with refs/heads/master into refs/merge-requests/234/train
3 jobs for !234 with feature/morten.ofstad/UpdateMetadataAPI into master in 5 minutes and 38 seconds (queued for 1 second)
merge train