Merge pull request #1399 from dotnet-bot/from-tfs
authorStephen Toub <stoub@microsoft.com>
Sun, 16 Aug 2015 12:18:11 +0000 (08:18 -0400)
committerStephen Toub <stoub@microsoft.com>
Sun, 16 Aug 2015 12:18:11 +0000 (08:18 -0400)
Merge changes from TFS


Trivial merge