Based on patch by mixedpuppy. MozReview-Commit-ID: BZwOtr4VbCH --HG-- extra : rebase_source : 2e3ad3fedaf82d0e5d3db9bcebf1c2faa46447e7
1336257