Merge branch 'rs/git-blame-mapcar-mapc' into maint