Bug 1108455 - Part 1. r=kinetik, a=2.1+

--HG--
extra : rebase_source : 33a47d9a18c3af280ffcaa231e020feb93dddcc7
Bug 1108455 - Part 2. r=jesup, a=2.1+

--HG--
extra : rebase_source : f0628c8cf68261bd9c6427c311bad65546d5eb97