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