Merge pull request #5573 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Tue, 7 Jun 2016 23:06:37 +0000 (16:06 -0700)
committerMatt Ellis <matell@microsoft.com>
Tue, 7 Jun 2016 23:06:37 +0000 (16:06 -0700)
Merge changes from TFS


Trivial merge