Merge branch 'master' into core-updates

diff --cc gnu/local.mk
Simple merge

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

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

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

diff --cc gnu/packages/python.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

diff --cc gnu/system.scm
Simple merge