Merge pull request dotnet/corefx#9853 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Tue, 5 Jul 2016 23:09:11 +0000 (16:09 -0700)
committerGitHub <noreply@github.com>
Tue, 5 Jul 2016 23:09:11 +0000 (16:09 -0700)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/corefx/commit/907aae8d3a113e2f46048b6fe43c3a72eb05af98


Trivial merge