Merge pull request #1865 from saper/shellredir