Merge some upstream changes into our wheezy branch