Fixed non-ASCII name text handling
Merge commit '3f8630c'