Merge tag 'v2.0.1' into debian-sid