Merge the following from the English version:
1.9 -> 1.11 security/Makefile 1.2 -> 1.4 security/mkindex.xsl