Sync'd branch integration/b2g-inbound with upstream @ Thu Sep 18 00:15:38 PDT 2014