Merge pull request #1188 from dotnet-bot/from-tfs
authorStephen Toub <stoub@microsoft.com>
Tue, 30 Jun 2015 18:25:06 +0000 (14:25 -0400)
committerStephen Toub <stoub@microsoft.com>
Tue, 30 Jun 2015 18:25:06 +0000 (14:25 -0400)
Merge changes from TFS


Trivial merge