Sync'd branch integration/b2g-inbound with upstream @ Fri Aug 29 16:36:40 PDT 2014