Merge "fix spelling mistakes found by codespell"