Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 00:33:41 PDT 2014