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