Gitconfig
Merge branch 'master' into utcs