1.1.2dev: Merge [11937] from 1.0-stable. Refs #9595.

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