Fix for unicode
Merge branch 'michel_2446_unicode' into next