Merge from wheezy