Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 09:56:43 PDT 2014