Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 01:07:45 PDT 2014