Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 06:10:44 PDT 2014