update upstream

Mattia Biondirequested to merge
upstream into debian/sid

Merge request reports