Merge pull request #2254 from codespell-project/master

Resync with master