Fix no_timeout option handling.

[ #2840 ]

Conflicts:
	CHANGELOG.md