1.1.2dev: merge from 1.0-stable (fix for #11186 and #11194)


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