Merge master into debian-master; updated Standards-Version