Merge pull request #4066 from nxhack/support-icu-config