Merge branch 'dfsg-orig'