Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 18:58:45 PDT 2014