Merge branch 'master' into rfc1143

Conflicts:
	libtelnet.c