Merge pull request #4933 from dotnet-bot/from-tfs
authorKyungwoo Lee <kyulee@microsoft.com>
Fri, 13 May 2016 00:00:18 +0000 (17:00 -0700)
committerKyungwoo Lee <kyulee@microsoft.com>
Fri, 13 May 2016 00:00:18 +0000 (17:00 -0700)
Merge changes from TFS


Trivial merge