Merge branch 'hotfix/gnome-extra/gucharmap'
Merge branch 'develop'
Merge branch 'master' of https://github.com/jcadam/flora
Merge branch 'develop'
hotfix: Fix build dependency on recoll
Merge branch 'hotfix/fix-recoll-build-dependency' into develop