Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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