inactive-mode improvements
Merge branch 'master' into inactive

Conflicts:
	AUTHORS
	CHANGELOG
Merge branch 'master' into inactive

Conflicts:
	AUTHORS
	CHANGELOG
Fix for valid socketfd == 0
Stupid bug in inactive-mode fixed