New uni logo
Preparing release 2.5.11
Back to development: 2.5.12
Merge branch '2.5.x'

Conflicts:
	CHANGES.txt
	setup.py