Merge pull request dotnet/coreclr#6124 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Tue, 5 Jul 2016 20:33:28 +0000 (13:33 -0700)
committerGitHub <noreply@github.com>
Tue, 5 Jul 2016 20:33:28 +0000 (13:33 -0700)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/coreclr/commit/e18245844cc8400400fc05c01ecf311cb9bdf019


Trivial merge