Merge pull request #12409 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Thu, 22 Jun 2017 23:06:24 +0000 (16:06 -0700)
committerGitHub <noreply@github.com>
Thu, 22 Jun 2017 23:06:24 +0000 (16:06 -0700)
Merge changes from TFS


Trivial merge