1.1.1dev: merge from 1.0-stable (fix of #10997)


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