Merge pull request #2371 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Thu, 17 Dec 2015 02:17:23 +0000 (18:17 -0800)
committerJan Kotas <jkotas@microsoft.com>
Thu, 17 Dec 2015 02:17:23 +0000 (18:17 -0800)
Merge changes from TFS


Trivial merge