Fixed an upload issue with archives
Merge remote-tracking branch 'remotes/seb/master'
TEST
Merge remote branch 'upstream/master' into doc