Merge branch 'master' into core-updates

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index e97ff50,c2b6f14..01ec944
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -881,15 -879,9 +882,14 @@@ dist_patch_DATA =                                                
    %D%/packages/patches/glibc-versioned-locpath.patch          \
    %D%/packages/patches/glibc-2.27-git-fixes.patch             \
    %D%/packages/patches/glibc-2.28-git-fixes.patch             \
 +  %D%/packages/patches/glibc-2.28-supported-locales.patch             \
 +  %D%/packages/patches/glibc-2.29-git-updates.patch           \
 +  %D%/packages/patches/glibc-supported-locales.patch          \
 +  %D%/packages/patches/glibc-2.27-supported-locales.patch             \
    %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch          \
-   %D%/packages/patches/glog-gcc-5-demangling.patch            \
    %D%/packages/patches/gmp-arm-asm-nothumb.patch              \
    %D%/packages/patches/gmp-faulty-test.patch                  \
 +  %D%/packages/patches/gnome-control-center-udisks.patch      \
    %D%/packages/patches/gnome-shell-theme.patch                        \
    %D%/packages/patches/gnome-tweaks-search-paths.patch                \
    %D%/packages/patches/gnutls-skip-trust-store-test.patch     \

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

diff --cc gnu/packages/emacs-xyz.scm
Simple merge

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

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

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

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

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