Merge pull request #2589 from WindowsAzure/FromPublicRepo

From public repo