Merge pull request #6797 from dotnet-bot/from-tfs
authorPat Gavlin <pgavlin@gmail.com>
Thu, 18 Aug 2016 23:09:29 +0000 (16:09 -0700)
committerGitHub <noreply@github.com>
Thu, 18 Aug 2016 23:09:29 +0000 (16:09 -0700)
Merge changes from TFS


Trivial merge