Fix #716: constant and unpredictable reordering during file upload

Merged Agate requested to merge 716-upload-reorder into master

Closes #716 (closed)

Merge request reports