Merge branch 'ef/mingw-upload-archive'