Merge pull request #2764 from esdrubal/fileinfo_tostring