Fix typo
Merging origin/john/master-pending-inputRichText into master