Merge branch 'master' into sru_2_0

Conflicts:
	src/rpn2solr.c

diff --cc src/rpn2solr.c
index 085de95,c72b11a..c7dff45
--- 1/src/rpn2solr.c
--- 2/src/rpn2solr.c
+++ b/src/rpn2solr.c
@@@ -210,10 -231,10 +231,9 @@@ static int rpn2solr_simple(solr_transfo
          const char *sterm = 0;
          size_t lterm = 0;
          Odr_int trunc = get_truncation(apt);
-         char *close_range = 0;
  
          wrbuf_rewind(w);
-         ret = rpn2solr_attr(ct, apt->attributes, w, &close_range);
 -        
+         ret = rpn2solr_attr(ct, apt->attributes, w, solr_attr);
  
          if (trunc == 0 || trunc == 1 || trunc == 100 || trunc == 104)
              ;