Merge remote-tracking branch 'origin/master' into 941-comment-hyperlink

32 jobs for 941-comment-hyperlink in 14 minutes and 40 seconds (queued for 2 minutes and 57 seconds)