Merge branch 'master' of https://opensourceprojects.eu/git/p/recoll1/code
Authored by: Jean-Francois Dockes 2018-10-12
Parent(s): [8a0994][f737a6]
Child(ren): [7f2b32]