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