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