Merge pull request dotnet/coreclr#3494 from dotnet-bot/from-tfs
authorPat Gavlin <pgavlin@gmail.com>
Thu, 3 Mar 2016 23:09:31 +0000 (15:09 -0800)
committerPat Gavlin <pgavlin@gmail.com>
Thu, 3 Mar 2016 23:09:31 +0000 (15:09 -0800)
Merge changes from TFS

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


Trivial merge