fix merge
Merge branch 'master' of https://github.com/WindowsAzure/azure-sdk-for-python