Fixed typo
[Delivers #52292837]
Merge branch 'master' into gh-pages