easier to debug...
Merge branch 'master' into devel
revision on unicode test
remove invalid file