Merge pull request #4060 from akallabeth/icu_support