Merge branch 'master' into fix-empty-doc-snippet-nesting