Make file operations more robust
Merge branch 'master' into plugins