Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 09:48:44 PDT 2014