Merge branch 'nd/gettext-vsnprintf'