Merge branch '4877-dont-delete-stdout'
authorTim Pierce <twp@curoverse.com>
Tue, 30 Dec 2014 21:50:04 +0000 (16:50 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 30 Dec 2014 21:50:04 +0000 (16:50 -0500)
Fixes #4877


Trivial merge