Merge branch 'master' of ssh://blastura@repo.or.cz/srv/git/AntiTD