Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 21:58:40 PDT 2014