Merge changes for debian (now in V2.5.1-rc1) into master