Merge pull request #2939 from codesparkle/upload-date-fix