Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 06:47:49 PDT 2014