sync with mozilla-inbound d349d0acef0e.
Merge branch 'm-i'