Code

Merged branch 'master' into wheezy-backports-sloppy.