Merge branch 'master' of git://repo.or.cz/alt-git to sync with v1.5.4-rc2