Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/make-bootstrap.scm

gnu: Add ImageMagick.

* gnu/packages/imagemagick.scm: New file.
* Makefile.am (MODULES): Add it.
* guix/download.scm (%mirrors): Add `imagemagick' entry.