Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 16:52:45 PDT 2014