Merge branch 'master' of linz:/srv/git/git-kairo