fix Pipe Renderer

closes #723
Merge remote-tracking branch 'remotes/upstream/master' into upstream