Merge branch 'br/svn-doc-include-paths-config'