Restore OutputCapture.wrap as it's a semi-public API
Merge pull request #143 from shepmaster/output-wrap

Restore OutputCapture.wrap as it's a semi-public API