fix some errors with file encodings
Merge branch 'master' into feature/borrow_merge