fix stream
Merge remote-tracking branch 'origin/master'

Conflicts:
	IOLoop.cpp
	Stream.cpp
	Stream.h
fix