Merge branch 'master' of git://git.savannah.gnu.org/guile into elisp