1.1.2beta1: merged [13113] from 1.0-stable (refs #11164)


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