Replaced some input streams by buffered streams.
Authored by: hagru 2013-05-01
Parent: [r109]
Child: [r111]
