Merged with WindowsAzure/dev

Merged in with WindowsAzure/dev branch.