Merge tag 'debian/1.8.5p2-1' into squeeze