Changes to package metadata
Changes to package metadata
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	README.rst