These changes are based on the fix for BZ #14134 in commit 6e230d11. (cherry picked from commit 41488498) Conflicts: NEWS iconvdata/Makefile