Working progress bar! Hooray!
Merge remote-tracking branch 'origin/master'