Merge pull request dotnet/corefx#9617 from dotnet-bot/from-tfs
authorStephen Toub <stoub@microsoft.com>
Thu, 23 Jun 2016 16:19:07 +0000 (12:19 -0400)
committerGitHub <noreply@github.com>
Thu, 23 Jun 2016 16:19:07 +0000 (12:19 -0400)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/corefx/commit/37cc76c6fab5bbeb21e017e77ad83752e874e8e9


Trivial merge