(cherry picked from commit eb4221895f) Conflicts: doc/xsl/.gitignore (cherry picked from commit 94f84083e4)
eb4221895f
94f84083e4