sync with ae3a5aad
convert to utf-8
sync with dd38235c
in progress