Merge branch 'hotfix-1.6.8'
Playing around some more with encodings
Bumped version
Merge branch 'hotfix-1.6.9' into develop