Merge branch feature/jorgen.lind/waveletadaptiveconnectionstring with...

Merge branch feature/jorgen.lind/waveletadaptiveconnectionstring with refs/heads/master into refs/merge-requests/446/train
3 jobs for !446 with feature/jorgen.lind/waveletadaptiveconnectionstring into master in 16 minutes and 21 seconds (queued for 4 seconds)
merge train