Changes for the wheezy upgrade
Merge remote-tracking branch 'github/master'