fix #215 re-adds InputStream into the render pipeline
Merge branch 'master', tag '2.1.1'