Merge branch feature/morten.ofstad/AddGridPointsToKnownMetadata with...

Merge branch feature/morten.ofstad/AddGridPointsToKnownMetadata with refs/heads/master into refs/merge-requests/388/train
3 jobs for !388 with feature/morten.ofstad/AddGridPointsToKnownMetadata into master in 20 minutes and 6 seconds (queued for 1 second)
merge train