Merge branch 'master' into paz-927

diff --cc src/client.c
Simple merge

diff --cc src/client.h
Simple merge

diff --cc src/pazpar2_config.c
Simple merge

diff --cc src/pazpar2_config.h
Simple merge

diff --cc src/session.c
Simple merge

diff --cc test/test_limit_limitmap.urls
Simple merge

diff --cc win/makefile
Simple merge