Merge branch 'upstream' into doc-orig
-rw-r--r-- 35147 COPYING
-rwxr-xr-x 233 cleanup-script.sh
drwxr-xr-x - doc