redo changes concerning utf8 that somehow got lost while merging into the master