Merge pull request dotnet/coreclr#1578 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Thu, 17 Sep 2015 14:57:10 +0000 (07:57 -0700)
committerJan Kotas <jkotas@microsoft.com>
Thu, 17 Sep 2015 14:57:10 +0000 (07:57 -0700)
Merge changes from TFS

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


Trivial merge