Version 6 commit, all files utf-8