cleaning up some stdout?
Merge remote-tracking branch 'upstream/master'
Merged with Jon's repo.