Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 17:24:42 PDT 2014