Merge with 'origin/master' to resolve conflicts with #932 (stream)

Conflicts:
	lib/standard/stream.nit
	lib/standard/string.nit
	src/nitls.nit
	tests/sav/test_exec.res