Merge remote-tracking branch 'mozilla/master' into v2.0