learngit merge
Merge branch 'master' into branch1

Conflicts:
	src/NIOCli.cpp