Merge branch 'master' into 1.7.dev

diff --cc htdocs/cgi-bin/main.cgi
index 85df24f2572961b2a65d65adea13c040c761fcaf,468d103d08c144a7878662013583d2ddd2d7b59b..5569f1de4d3c086059ce175acc1d4c45b0aa25ec
--- 1/htdocs/cgi-bin/main.cgi
--- 2/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@@ -1350,5 -1435,5 +1322,5 @@@ return qq
                                        </p>
  </div>
  </td></tr></table>
- )}
- 
 -___STR
 -}
++)
++}