Fix problem with /delete API, make sure to pass the file parameter.
Merge remote-tracking branch 'origin/master'