Merge pull request #3567 from shaffe-fr/patch-1

Fix incorrect FCPATH when a folder is named SELF