Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 17:09:44 PDT 2014