Merge tag 'v1.7.8.4' into debian-sid