Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x