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

Merge branch feature/morten.ofstad/VDSWaveletDataFormatUpgrade with refs/heads/master into refs/merge-requests/495/train
3 jobs for !495 with feature/morten.ofstad/VDSWaveletDataFormatUpgrade into master in 20 minutes and 43 seconds (queued for 4 seconds)
merge train