Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 19:19:35 PDT 2014