Merge branch 'master' into docs

13 jobs for docs in 17 minutes and 24 seconds (queued for 1 second)