Merge branch 'master' into Gtk.

diff --cc src/cref/conpkg.scm
Simple merge

diff --cc src/edwin/edwin.pkg
Simple merge

diff --cc src/edwin/fileio.scm
Simple merge

diff --cc src/edwin/nntp.scm
Simple merge

diff --cc src/imail/imail-mime.scm
Simple merge

diff --cc src/pgsql/pgsql.scm
Simple merge

diff --cc src/runtime/make.scm
Simple merge

diff --cc src/runtime/runtime.pkg
Simple merge

diff --cc tests/runtime/test-mime-codec.scm
Simple merge