Merge branch 'master' into core-updates

diff --cc gnu-system.am
index 2b81579,a7fbb27..e2eb043
--- 1/gnu-system.am
--- 2/gnu-system.am
+++ b/gnu-system.am
@@@ -201,9 -210,7 +210,8 @@@ dist_patch_DATA =                                          
    gnu/packages/patches/glib-tests-homedir.patch                       \
    gnu/packages/patches/glib-tests-prlimit.patch                       \
    gnu/packages/patches/glibc-bootstrap-system.patch           \
 +  gnu/packages/patches/glibc-ldd-x86_64.patch                 \
    gnu/packages/patches/glibc-no-ld-so-cache.patch             \
-   gnu/packages/patches/gnutls-fix-tests-on-32-bits-system.patch       \
    gnu/packages/patches/grub-gets-undeclared.patch             \
    gnu/packages/patches/guile-1.8-cpp-4.5.patch                        \
    gnu/packages/patches/guile-default-utf8.patch                       \

diff --cc guix/scripts/pull.scm
Simple merge