Fixed leftovers from old upload code.
Merge branch 'test' into dev