more_threads option
Less client asserts
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/defaultsettings.cpp