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