Merge branch 'vk/autoconf-gettext'