Code

changelog: Backport to Lenny.