Merge from debian wheezy