Fixes from earlier
Merge branch 'master' of github.com:telehash/objc

Conflicts:
	common/THReliableChannel.m