Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/crates-io.scm
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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