Clarify encoding issues
Merge branch 'develop'