Code

Merged branch 'master' into squeeze-backports.