Merge branch 'master' into for-iOS

Conflicts:
	CK2SSHCredential.h
	CK2SSHCredential.m