Merge branch 'mn/maint-iconv-autoconf'