Updated to match the changes on Mozilla-Inbound.


This should make the master branch now the same as what is right now on Mozilla-Inbound, and hopefully soon on Mozilla-Central.  Here are the M-I pushes:

https://hg.mozilla.org/integration/mozilla-inbound/rev/fd72e28c6d38
https://hg.mozilla.org/integration/mozilla-inbound/rev/1b3e953be799
https://hg.mozilla.org/integration/mozilla-inbound/rev/6712067462a9