Merge pull request #7116 from dotnet-bot/from-tfs
authorSean Gillespie <sean.william.g@gmail.com>
Fri, 9 Sep 2016 00:45:58 +0000 (17:45 -0700)
committerGitHub <noreply@github.com>
Fri, 9 Sep 2016 00:45:58 +0000 (17:45 -0700)
Merge changes from TFS


Trivial merge