Merge pull request #3703 from nxhack/icu-update-to-v58_2