Merge pull request #4976 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Sun, 15 May 2016 06:09:52 +0000 (23:09 -0700)
committerMatt Ellis <matell@microsoft.com>
Sun, 15 May 2016 06:09:52 +0000 (23:09 -0700)
Merge changes from TFS


Trivial merge