Merge tag 'v2.1.1' into debian-sid