Merge branch 'master' into core-updates

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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