1.1.2dev: merge [11786] from 1.0-stable (fix of #11140)


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11787 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: merge [11790] from 1.0-stable (fix of #11167, #10514 and #10390)


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