Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 02:43:39 PDT 2014