Merge branch 'master' of git+ssh://dardosordi@repo.or.cz/srv/git/slashcake