Merge branch 'master' of https://github.com/dotnet/coreclr
authortijoytom <tijoytom@gmail.com>
Wed, 18 May 2016 05:29:45 +0000 (22:29 -0700)
committertijoytom <tijoytom@gmail.com>
Wed, 18 May 2016 05:29:45 +0000 (22:29 -0700)

Trivial merge