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

Merge branch feature/kelly.walker/wavelet_update with refs/heads/master into refs/merge-requests/559/train
3 jobs for !559 with feature/kelly.walker/wavelet_update into master in 22 minutes and 32 seconds (queued for 1 second)
merge train