Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 04:44:14 PDT 2014