Merge pull request #2081 from codespell-project/master

Resync with master