Merge tag 'refs/tags/v2.0.0' into fresh2

Conflicts:
	.gitignore
	CNAME
	README.md
	_config.yml