Merge branch 'upstream' into dfsg-orig, improve cleanup-script.sh