Merge branch 'debian' into wheezy