Merge pull request #2589 from WindowsAzure/FromPublicRepo

From public repo
Merge pull request #1743 from WindowsAzure/FromPrivateRepo

Merge pull request #2589 from WindowsAzure/FromPublicRepo