Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 08:06:43 PDT 2014