Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 3f27a5f,9482d4b..acdadd6
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -580,9 -582,10 +580,8 @@@ dist_patch_DATA =                                         
    %D%/packages/patches/emacs-source-date-epoch.patch          \
    %D%/packages/patches/erlang-man-path.patch                  \
    %D%/packages/patches/eudev-rules-directory.patch            \
 -  %D%/packages/patches/eudev-conflicting-declaration.patch    \
    %D%/packages/patches/evilwm-lost-focus-bug.patch            \
 -  %D%/packages/patches/expat-CVE-2016-0718-fix-regression.patch       \
    %D%/packages/patches/exim-CVE-2017-1000369.patch            \
-   %D%/packages/patches/fabric-tests.patch                     \
    %D%/packages/patches/fastcap-mulGlobal.patch                        \
    %D%/packages/patches/fastcap-mulSetup.patch                 \
    %D%/packages/patches/fasthenry-spAllocate.patch             \

diff --cc gnu/packages/admin.scm
Simple merge

diff --cc gnu/packages/base.scm
Simple merge

diff --cc gnu/packages/bioinformatics.scm
Simple merge

diff --cc gnu/packages/bootloaders.scm
Simple merge

diff --cc gnu/packages/compression.scm
Simple merge

diff --cc gnu/packages/gcc.scm
Simple merge

diff --cc gnu/packages/gnupg.scm
Simple merge

diff --cc gnu/packages/image.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/python.scm
Simple merge

diff --cc gnu/packages/tls.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge