0.12dev: merged [7998-7999,8015] from 0.11-stable (fixes for #6588 and #8179)
0.12dev: merged [7998-7999,8015] from 0.11-stable (fixes for #6588 and #8179)

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

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