Merge branch 'master' of ssh://stefankoegl@repo.or.cz/srv/git/ochimeru