Merge branch 'master' into core-updates

diff --cc gnu-system.am
index 97dc92c,2eae148..9f4f959
--- 1/gnu-system.am
--- 2/gnu-system.am
+++ b/gnu-system.am
@@@ -248,11 -251,12 +251,13 @@@ dist_patch_DATA =                                               
    gnu/packages/patches/avahi-localstatedir.patch              \
    gnu/packages/patches/bigloo-gc-shebangs.patch                       \
    gnu/packages/patches/binutils-ld-new-dtags.patch            \
 -  gnu/packages/patches/binutils-loongson-madd-fix.patch               \
    gnu/packages/patches/binutils-loongson-workaround.patch     \
+   gnu/packages/patches/bitlbee-fix-tests.patch                        \
+   gnu/packages/patches/bitlbee-memset-fix.patch                       \
    gnu/packages/patches/cdparanoia-fpic.patch                  \
    gnu/packages/patches/cmake-fix-tests.patch                  \
 +  gnu/packages/patches/coreutils-dummy-man.patch              \
 +  gnu/packages/patches/coreutils-skip-nohup.patch             \
    gnu/packages/patches/cpio-gets-undeclared.patch             \
    gnu/packages/patches/curl-fix-test172.patch                 \
    gnu/packages/patches/dbus-localstatedir.patch                       \

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