Merge pull request dotnet/coreclr#4326 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Thu, 14 Apr 2016 22:59:13 +0000 (15:59 -0700)
committerMatt Ellis <matell@microsoft.com>
Thu, 14 Apr 2016 22:59:13 +0000 (15:59 -0700)
Merge changes from TFS

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


Trivial merge