Merge branch 'master' into docedit

5 jobs for docedit in 64 minutes and 34 seconds (queued for 2 seconds)