Refactored set_file_delete_properties to set_additional_file_properties.
Merge branch 'master' into gh-pages