Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/image.scm

diff --cc gnu-system.am
Simple merge

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

diff --cc gnu/packages/image.scm
index 06f6271,1536378..149720e
--- 1/gnu/packages/image.scm
--- 2/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -19,6 -19,10 +19,9 @@@
  (define-module (gnu packages image)
    #:use-module (gnu packages)
    #:use-module (gnu packages compression)
 -  #:use-module (gnu packages file)
+   #:use-module (gnu packages fontutils)
+   #:use-module (gnu packages pkg-config)
+   #:use-module (gnu packages xml)
    #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
    #:use-module (guix packages)
    #:use-module (guix download)