Merge pull request #2623 from esdrubal/fileinfo_moveto