Merge brancupd.h 'master' into 2.2.dev

diff --cc htdocs/cgi-bin/main.cgi
index 06bae75dfaed6f882d67d9e3ff44d0d5a88667d4,9437a7f9bd3c9233a82c520b2efb4cc2c1dc452c..32fdd23769669547fa9a84e42fd6920d6b637873
--- 1/htdocs/cgi-bin/main.cgi
--- 2/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@@ -1311,10 -1303,12 +1310,9 @@@ sub authenticate 
  }
  
  sub fetchAutocomplete {
-     my $st = traceDBExe('SELECT LOG from LOG' . $stmE.';;' );
 -
 -    my $st = traceDBExe('SELECT LOG from LOG' . $stmE );
 -    my $awl = Settings::autoWordLength();
 -    my %hsh = ();
++    my $st = traceDBExe('SELECT LOG from LOG' . $stmE);
      while ( my @row = $st->fetchrow_array() ) {
          my ($wl,$log) = ("",$row[0]);
- 
          #Decode escaped \\n
          $log =~ s/\\n/\n/gs;
          $log =~ s/''/'/g;