Merge branch 'master' into core-updates Conflicts: Makefile.am gnu/packages/base.scm
gnu: Add lua. * gnu/packages/lua.scm: New file. * Makefile.am: add it.