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