Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 00:53:53 PDT 2014