Merge pull request #577 from cshore/pull-request-safe-file-upload