Merge remote-tracking branch 'patrick/master'
[WIP] progress monitoring improvements
Merge remote-tracking branch 'dean/master'
Tweaking progress meter