Merge branch 'wip-guile-include-m4-macros' into 'master'