Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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