Merge branch 'master' of ssh://SebastianRose@repo.or.cz/srv/git/Worg