Merge branch 'master' into kiconv2