Merge branch 'hotfix/db35a1-typo'
Switch back to ugly size output.

This works on Windows and doesn't assume *nix terminal with Perl installed.
Merge remote-tracking branch 'upstream/master' into edge