docs update
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x

Conflicts:
	README.md