update the version
Merge branch 'azure' into azure-1.1

Conflicts:
	setup.py