Merge tag 'v1.7.10.2' into debian-sid