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

Conflicts:
	setup.py