Merge branch 'staging'

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/check.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/maths.scm
Simple merge

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