Tweak to upload script.
Merge commit 'b5e1a83d7c52e4dad1eba140abd4c75abd307618' into develop