Merge branch feature/morten.ofstad/VDSWaveletDataFormatUpgrade with...
Merge branch feature/morten.ofstad/VDSWaveletDataFormatUpgrade with refs/heads/master into refs/merge-requests/495/train
Merge branch feature/morten.ofstad/VDSWaveletDataFormatUpgrade with refs/heads/master into refs/merge-requests/495/train