Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Missing collection
Fix #646 #647
Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
Sync with 1.6
Merge pull request #651 from emmanuel-keller/master

Bug fix and enhancement