Code

Merge commit 'v_0_6_12-1' into lenny-backports