Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 19:15:40 PDT 2014