Merge branch 'for-junio' of git://github.com/kusma/git