Merge pull request #562 from cshore/pull-request-upload-dir