Finishing UTF-8 branch.