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

Merge branch feature/morten.ofstad/FixWaveletDecompression with refs/heads/master into refs/merge-requests/489/train
3 jobs for !489 with feature/morten.ofstad/FixWaveletDecompression into master in 18 minutes and 56 seconds (queued for 3 seconds)
merge train