Merge branch 'master' into guile-meta