Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 02:39:46 PDT 2014