Merge pull request #4856 from sartura/file_fix_install