Merge branch 'master' into Gtk.

diff --cc src/Makefile.in
Simple merge

diff --cc src/microcode/cmpauxmd/i386.m4
Simple merge

diff --cc src/microcode/cmpauxmd/x86-64.m4
Simple merge

diff --cc src/microcode/pruxffi.c
Simple merge

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

diff --cc src/runtime/runtime.pkg
index ea6aac30ed1777c23e3ad9feca523c55c114017b,47b1729bc185d704383be67b6a7c3998498d6da1..9714c3f96cbf2220b542edcf34c90815dbdd3596
--- 1/src/runtime/runtime.pkg
--- 2/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@@ -3341,7 -3341,7 +3341,8 @@@ USA
          link-shim
          install-shim
          install-load-option
 -        install-html)
++        install-html
 +        load-option/suppress-loading-message?)
    (initialization (initialize-package!)))
  
  (define-package (runtime program-copier)