Merge remote-tracking branch 'dean/master'
Merge remote-tracking branch 'dean/master'
adding in the double-progress meter (yay!)
Merge remote-tracking branch 'patrick/master'