1.1.2dev: Merge [11894:11898] from 1.0-stable.


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11900 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: Merge [11899] from 1.0-stable (fix for #11118).


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11901 af82e41b-90c4-0310-8c96-b1721e28e2e2