Merge branch 'master' into spell-check

diff --combined src/session.c
index c8f1df5,8b76a53..439ad7b
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -438,7 -438,7 +438,7 @@@ static int prepare_map(struct session *
              }
          }
          sdb->map = normalize_cache_get(se->normalize_cache,
-                                        se->service->server->config, s);
+                                        se->service, s);
          if (!sdb->map)
              return -1;
      }
@@@ -921,8 -921,6 +921,8 @@@ struct session *new_session(NMEM nmem, 
      return session;
  }
  
 +const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf);
 +
  static struct hitsbytarget *hitsbytarget_nb(struct session *se,
                                              int *count, NMEM nmem)
  {
@@@ -951,9 -949,6 +951,9 @@@
          res[*count].connected  = client_get_connection(cl) ? 1 : 0;
          session_settings_dump(se, client_get_database(cl), w);
          res[*count].settings_xml = nmem_strdup(nmem, wrbuf_cstr(w));
 +        wrbuf_rewind(w);
 +        wrbuf_puts(w, "");
 +        res[*count].suggestions_xml = nmem_strdup(nmem, client_get_suggestions_xml(cl, w));
          wrbuf_destroy(w);
          (*count)++;
      }