Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 14:49:14 PDT 2014