Merge branch 'master' into Gtk

diff --cc src/Setup.sh
index 33f0d7bf0867f8c45264f7e3c4f8af8a57d6b995,b9ca82cdfe4b2492c5951ecc4a371c552dc81b48..ea7b4227d0e9f293e4f8a85792a1bdd8f571d532
--- 1/src/Setup.sh
--- 2/src/Setup.sh
+++ b/src/Setup.sh
@@@ -85,13 -85,8 +85,9 @@@ maybe_link lib/include ../microcod
  maybe_link lib/optiondb.scm ../etc/optiondb.scm
  maybe_link lib/runtime ../runtime
  maybe_link lib/compiler ../compiler
 +maybe_link lib/sos ../sos
  maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
  maybe_link lib/ffi ../ffi
- maybe_link lib/ffi-test-shim.so ../ffi/ffi-test-shim.so
- maybe_link lib/ffi-test-types.bin ../ffi/ffi-test-types.bin
- maybe_link lib/ffi-test-const.bin ../ffi/ffi-test-const.bin
- maybe_link lib/gtk ../gtk
  
  maybe_link config.sub microcode/config.sub
  maybe_link config.guess microcode/config.guess

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