fix compilation and unicode errors in the importer
Merge branch 'master' into release