Merge remote-tracking branch 'origin/wheezy-changes'