FIXMEs
Merge branch 'master' into simpler-build-upload
* Builder: upload progress bar

Fix progress bar