changelog
version number
Version number
version 2.0.3
Merge branch 'v2.0' into v2.1

Conflicts:
	VERSION
version 2.1
Merge branch 'v2.1'