TracMercurial for 0.13: merged the fix for #10096 and the partial fix for #10091.
Authored by: cboos 2011-03-25
Parent: [r10657]
Child: [r10659]