Merge branch 'master' into core-updates

Conflicts:
	Makefile.am
	gnu/packages/base.scm

gnu: Add w3m.

* gnu/packages/w3m.scm,
  gnu/packages/patches/w3m-fix-compile.patch: New files.
* Makefile.am (MODULES): Add 'w3m.scm'.
  (dist_patch_DATA): Add 'w3m-fix-compile.patch'.