Merge commit 'v1.7.7.5' into debian-sid