Added the option to show the remaining time *and* the percentage
Merge pull request #2665 from blockcoder/patch-1

[2.2] Added the option to show the remaining time *and* the percentage