Merge branch 'master' into core-updates Conflicts: gnu-system.am
gnu: Add xapian. * gnu/packages/search.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.