Fixes bug 420947 and also includes rest of the upstream fixes over current stable, looks like no bug was opened against it Thanks Reproducible: Always
*** This bug has been marked as a duplicate of bug 451468 ***