Merge pull request #2292 from WindowsAzure/dev

Merge dev into release