Merge pull request #2413 from Azure/master

Merge master back into dev
Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-tools into private