Merge branch 'upstream' into dfsg-orig