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

Merge branch feature/morten.ofstad/VolumeDataStoreVDSFile with refs/heads/master into refs/merge-requests/203/train
3 jobs for !203 with feature/morten.ofstad/VolumeDataStoreVDSFile into master in 5 minutes and 29 seconds (queued for 2 seconds)
merge train