Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 14:29:17 PDT 2014