Fix 'the the' duplication (partial backport of r71103
6 files changed