Merge branch 'ab/dynamic-gettext-poison'