Merge of all previous pull requests 

Hi,

Merge of all previous pull requests if needed.

Daniel Berthereau
Infodoc & Knowledge management