fix issue #18
Merge branch 'azure' into azure-1.1
Merge branch 'azure-1.1' into azure-1.2