Merge branch 'master' into utf8-conversion after 2.3.1 release