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