Merge commit 'v1.7.8.1' into debian-sid