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