Mass commit changes for 3.1b2+dfsg-5 (single commits are somehow lost, also...

Mass commit changes for 3.1b2+dfsg-5 (single commits are somehow lost, also the Debian revision bump from -3 to -5 is a failure but has just happened that way)