1.1.2dev: merge [11797] from 1.0-stable (fix of #717)


git-svn-id: http://svn.edgewall.org/repos/trac/trunk@11798 af82e41b-90c4-0310-8c96-b1721e28e2e2
1.1.2dev: merge [11799] from 1.0-stable (fix of #11180)


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