Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 08:48:50 PDT 2014