Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 22:38:43 PDT 2014