Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 05:13:38 PDT 2014