Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/libwebsockets.scm

gnu: Add miniupnpc.

* gnu/packages/upnp.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.

Signed-off-by: Andreas Enge <andreas@enge.fr>