Some non-conflicting change from GUI.
Merge branch 'master' of https://github.com/cysun/gittest.git