Changes from 1.5.24-0.1

These changes bring the repos up to date with 1.5.24-0.1.

If you want to merge this, you probably also want to merge the pristine-tar and upstream branches.