This is a merge request to sync debian/master from salsa.d.o please.
merged
mentioned in commit 83c71b20