Released 2.0.5
Merge remote-tracking branch 'origin/2.0'

Conflicts:
	CHANGELOG.md