About time to declare this as a stable version, should have done this ages
ago...
Merge branch 'master' into devel

Conflicts:
	setup.py