Merge pull request #5111 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 20 May 2016 06:39:35 +0000 (23:39 -0700)
committerJan Kotas <jkotas@microsoft.com>
Fri, 20 May 2016 06:39:35 +0000 (23:39 -0700)
Merge changes from TFS


Trivial merge