Merge branch 'master' into utf8-conversion
drwxr-xr-x - cde