Index: openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info,v
diff -u -r1.39.2.15 -r1.39.2.16
--- openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	15 Sep 2016 07:21:10 -0000	1.39.2.15
+++ openacs-4/packages/acs-bootstrap-installer/acs-bootstrap-installer.info	1 Nov 2016 18:27:03 -0000	1.39.2.16
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-   <version name="5.9.1d5" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.9.1d5.apm">
+   <version name="5.9.1d6" url="http://openacs.org/repository/download/apm/acs-bootstrap-installer-5.9.1d6.apm">
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Bootstraps an OpenACS installation.</summary>
         <release-date>2015-10-04</release-date>
@@ -18,7 +18,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-bootstrap-installer" version="5.9.1d5"/>
+        <provides url="acs-bootstrap-installer" version="5.9.1d6"/>
         <requires url="acs-kernel" version="5.9.0"/>
         <requires url="acs-templating" version="5.9.0"/>
 
Index: openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl,v
diff -u -r1.2.2.9 -r1.2.2.10
--- openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl	12 Sep 2016 18:08:38 -0000	1.2.2.9
+++ openacs-4/packages/acs-bootstrap-installer/installer/www/blank-master.tcl	1 Nov 2016 18:27:03 -0000	1.2.2.10
@@ -233,15 +233,24 @@
     }
 }
 
+#
 # Retrieve headers and footers
+#
 set header [template::get_header_html]
 set footer [template::get_footer_html]
-template::head::prepare_multirows
 
-# body event handlers are converted into body_scripts
+#
+# Body event handlers are converted into body_scripts
+#
 template::get_body_event_handlers
 
 #
+# Build multirows: this has to be done after get_body_event_handlers
+# to include these body_scripts as well.
+#
+template::head::prepare_multirows
+
+#
 # Add the content security policy. Since this is the blank master, we
 # are defensive and check, if the system has already support for it
 # via the CSPEnabledP kernel parameter. Otherwise users would be