Merge remote-tracking branch 'brson/io'

Conflicts:
	src/libcore/task/local_data_priv.rs