Merge branch 'r/2.0.1'

Conflicts:
	git-plugin-updates.php
	readme.md