C7
Merge branch 'test' of https://github.com/mhae/nio.git into test2

Conflicts:
	f1