Added explicit editor specification to gitconfig.
Merge branch 'master' into mac