Merge pull request #5587 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Wed, 8 Jun 2016 05:27:15 +0000 (22:27 -0700)
committerJan Kotas <jkotas@microsoft.com>
Wed, 8 Jun 2016 05:27:15 +0000 (22:27 -0700)
Merge changes from TFS


Trivial merge