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