.Client is no more
Merge branch 'master' into options-overhaul

Conflicts:
	docs/security.md