Merge with git://repo.or.cz/git.git#master