Merge branch mguth-doc-strings with refs/heads/master into refs/merge-requests/316/train

27 jobs for !316 with mguth-doc-strings into master in 11 minutes and 58 seconds (queued for 7 seconds)
merge train