Merge branch 'master' into core-updates

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages.scm
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc guix/build/glib-or-gtk-build-system.scm
Simple merge

diff --cc guix/ui.scm
Simple merge