Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 25 15:17:43 PDT 2014