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