1.1.2dev: merge [11934] from 1.0-stable


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