Merge branch 'v2.3.0' of git://github.com/jnavila/git