Merge pull request #1270 from Arantor/release-2.1

Stuff
Fix for layout of substep progress bar on upgrader.

Signed-off-by: ziycon <ziycon.eire@gmail.com>
Merge pull request #1273 from ziycon/upgrader_fixes

Fix for layout of substep progress bar on upgrader.