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

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