Merge branch 'master' of https://github.com/dotnet/coreclr
authordnickless <daniel.hegener@gmx.net>
Wed, 11 Jan 2017 21:48:55 +0000 (16:48 -0500)
committerdnickless <daniel.hegener@gmx.net>
Wed, 11 Jan 2017 21:48:55 +0000 (16:48 -0500)

Trivial merge