Merge branch 'master' into templateallthemarkup

diff --combined examples/htdocs/jasmine-local-popup.html
index cde7ac2,792ec34..12af4ac
--- 1/examples/htdocs/jasmine-local-popup.html
--- 2/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@@ -24,7 -24,6 +24,7 @@@
      <script type="text/javascript" src="src/mkws-widget-categories.js"></script>
      <script type="text/javascript" src="src/mkws-widget-log.js"></script>
      <script type="text/javascript" src="src/mkws-widget-record.js"></script>
 +    <script type="text/javascript" src="src/mkws-templates.js"></script>
      <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
      <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
  
@@@ -57,7 -56,7 +57,7 @@@
      var jasmine_config = {
        search_query: "netbsd",
        expected_hits: 10,
-       active_clients: 13,
+       active_clients: 12,
        check_motd: false,
        check_sortby: true,
        show_record_url: true