Merge branch 'master' into session_lock

Conflicts:
	src/session.c

diff --cc src/session.c
index 42de3ee,5ad2694..da46703
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -1705,9 -1674,10 +1705,10 @@@ int ingest_record(struct client *cl, co
          xmlFreeDoc(xdoc);
          return -1;
      }
 -    session_enter(se, "ingest_record");
 -    if (client_get_session(cl) == se && se->relevance)
 +    assert(client_get_session(cl) == se);
 +
-     ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
++    if (se->relevance)
+         ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
 -    session_leave(se, "ingest_record");
  
      xmlFreeDoc(xdoc);
      return ret;