Meging from WindowsAzure/dev

Merging from Windows Azure dev branch.