Merge branch 'upstream' into debian

No match.