Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 17:19:40 PDT 2014