Merge branch 'dfsg_clean'