Added potential fix for file renaming issue on Linux
Merge branch 'master' into devel