Merge pull request #1312 from AzureRT/dev

Dev
Merge remote-tracking branch 'remotes/WindowsAzure/dev' into dev