Merge remote-tracking branch 'origin/version-1.2.0' into master

Conflicts:
	gnu/packages/bioinformatics.scm

The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.

diff --cc .dir-locals.el
Simple merge

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/package-management.scm
Simple merge

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

diff --cc gnu/services/base.scm
Simple merge