Git fork

Merge branch 'en/rename-directory-detection-reboot'

* en/rename-directory-detection-reboot:
merge-recursive: use xstrdup() instead of fixed buffer

No differences found between the selected revisions.