correct system specific name in git config
Merge branch 'master' into ccap