commit 2.2.0
Merge remote-tracking branch 'origin/master' into 2.0

Conflicts:
	README