Here's an updated patch with utfcpp moved to textutils.
-- 
Alex Griffin