Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 22 18:17:35 PDT 2014