Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 6a48782,0ead43a..c10894c
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1012,7 -1009,9 +1012,7 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/openocd-nrf52.patch                    \
    %D%/packages/patches/opensmtpd-fix-crash.patch              \
    %D%/packages/patches/openssl-runpath.patch                  \
-   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch                \
 -  %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch      \
 -  %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch      \
+   %D%/packages/patches/openssl-1.1-c-rehash-in.patch          \
    %D%/packages/patches/openssl-c-rehash-in.patch              \
    %D%/packages/patches/orpheus-cast-errors-and-includes.patch \
    %D%/packages/patches/osip-CVE-2017-7853.patch                       \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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