Update git config email
Merge branch 'master' into osx