Merge branch feature/kelly.walker/wavelet_move with refs/heads/master into...

Merge branch feature/kelly.walker/wavelet_move with refs/heads/master into refs/merge-requests/556/train
3 jobs for !556 with feature/kelly.walker/wavelet_move into master in 25 minutes and 13 seconds (queued for 3 seconds)
merge train