SimpleTextReader and Writer was not using buffered streams.
Merge remote-tracking branch 'origin/master'