Merge branch 'master' into utf8-conversion, after 2.3.0a release
drwxr-xr-x - cde