r675 - Add patch from @abesto to improve unicode support