Merge branch 'master' into core-updates

diff --cc gnu-system.am
Simple merge

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

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

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

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

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

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

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

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