Merge branch 'master' into core-updates Conflicts: Makefile.am gnu/packages/base.scm
gnu: Add GNU cppi. * gnu/packages/cppi.scm: New file. * Makefile.am (MODULES): Add it.