Fix #1102, implements #716
Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
Merge pull request #1113 from emmanuel-keller/master

Fix #1102, implements #716