Backport spelling fix from trunk