Code

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6