Merge remote-tracking branch 'origin/master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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