Merge tag 'v1.7.9.3' into debian-sid