Merge pull request dotnet/coreclr#7745 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 21 Oct 2016 03:45:43 +0000 (20:45 -0700)
committerGitHub <noreply@github.com>
Fri, 21 Oct 2016 03:45:43 +0000 (20:45 -0700)
Merge changes from TFS

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


Trivial merge