Merge branch 'master' into core-updates

diff --cc doc/guix.texi
Simple merge

diff --cc gnu-system.am
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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