1.3.2dev: merge [15779] from 1.2-stable (fix for #12757, again)
1.3.2dev: merge [15779] from 1.2-stable (fix for #12757, again)


git-svn-id: 0d96b0c1a6983ccc08b3732614f4d6bfcf9cbb42@15780 af82e41b-90c4-0310-8c96-b1721e28e2e2

rbaumg/trac,rbaumg/trac,rbaumg/trac,rbaumg/trac