Merge tag 'v1.8.4.2' into debian-sid