utf-8 char fix...
Merge commit '22a971aefdf9dba23896a8ee71622e6c41f554dd' into HEAD