Starting Debian wheezy upgrades
Merge branch 'master' into next