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