Merge branch 'tr/maint-merge-file-subdir' into maint

* tr/maint-merge-file-subdir: merge-file: correctly find files when called in subdir prefix_filename(): safely handle the case where pfx_len=0