Merge commit '3082a435433285ca0d5bccc515783183922df6cc' into cht_win
Set encoding of GUI to utf-8
Merge commit '79c392d18920a2cb1c662e82cc4f74cdf770d76b'

Conflicts:
	gitconfig