Merge pull request dotnet/coreclr#1861 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Sat, 24 Oct 2015 08:27:09 +0000 (01:27 -0700)
committerMatt Ellis <matell@microsoft.com>
Sat, 24 Oct 2015 08:27:09 +0000 (01:27 -0700)
Merge changes from TFS

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


Trivial merge