Merge branch feature/jorgen.lind/uintwaveletnosse with refs/heads/master into...

Merge branch feature/jorgen.lind/uintwaveletnosse with refs/heads/master into refs/merge-requests/247/train
3 jobs for !247 with feature/jorgen.lind/uintwaveletnosse into master in 6 minutes and 12 seconds (queued for 2 seconds)
merge train