sync to upstream (fetch UTF-8 ect)

merge sync branch to master