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

Merge branch feature/jorgen.lind/waveletinteger with refs/heads/master into refs/merge-requests/241/train
3 jobs for !241 with feature/jorgen.lind/waveletinteger into master in 6 minutes and 10 seconds (queued for 1 second)
merge train