Merge 1.5 release changes into debian-develop