Dev version update.
Merge branch 'develop' into feature/longsubscription

Conflicts:
	setup.py