Merge remote-tracking branch 'mozilla/master' into bug_1109099