unicode fixes
Merge branch 'devel'