Merge branch 'wheezy'