Do not configure gitconfig. puppet will do that.
Merge branch 'release/release1'