Merge tag 'v2.1.0' into debian-sid