Merge pull request #1371 from DimitriPapadopoulos/codespell