Merge remote-tracking branch 'upstream/master' into l10nOptim-bug853933