Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel