merge from azure/azure-sdk-for-net/master