Fix some warnings upon creation/deletion of files
Merge branch 'master' into nginx