Merge branch 'js/configure-libintl' into maint