guh encoding
sort out UTF-8 nonsense...
Merge branch 'master' into local-files