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