Merge pull request #5050 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 18 May 2016 09:18:20 +0000 (02:18 -0700)
committerJan Kotas <jkotas@microsoft.com>
Wed, 18 May 2016 09:18:20 +0000 (02:18 -0700)
Merge changes from TFS


Trivial merge