Merge branch 'dfsg-orig' into dfsg-debian