Merge remote-tracking branch 'origin/master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc gnu/local.mk
index db15273,ca415ec..e7db9a6
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -879,8 -892,10 +887,9 @@@ dist_patch_DATA =                                         
    %D%/packages/patches/ruby-puma-ignore-broken-test.patch       \
    %D%/packages/patches/ruby-rack-ignore-failing-test.patch      \
    %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
 -  %D%/packages/patches/sed-hurd-path-max.patch                        \
    %D%/packages/patches/scheme48-tests.patch                   \
    %D%/packages/patches/scotch-test-threading.patch            \
+   %D%/packages/patches/screen-CVE-2017-5618.patch             \
    %D%/packages/patches/sdl-libx11-1.6.patch                   \
    %D%/packages/patches/seq24-rename-mutex.patch                       \
    %D%/packages/patches/serf-comment-style-fix.patch           \

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/version-control.scm
Simple merge

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

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