Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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

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

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

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