Merge branch mguth-plotting with refs/heads/master into refs/merge-requests/396/train

42 jobs for !396 with mguth-plotting into master in 10 minutes and 17 seconds (queued for 3 seconds)
merge train