Merge branch 'master' of https://github.com/jcagme/coreclr
authorJuan Carlos Aguilera Mendez <juanam@microsoft.com>
Fri, 2 Mar 2018 22:19:44 +0000 (14:19 -0800)
committerJuan Carlos Aguilera Mendez <juanam@microsoft.com>
Fri, 2 Mar 2018 22:19:44 +0000 (14:19 -0800)

Trivial merge