Version tag (2.0.4)
Merge branch 'v2.0' into v2.1

Conflicts:
	VERSION
Tag (2.1.0)