Merge pull request #2346 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Tue, 15 Dec 2015 20:42:17 +0000 (12:42 -0800)
committerJan Kotas <jkotas@microsoft.com>
Tue, 15 Dec 2015 20:42:17 +0000 (12:42 -0800)
Merge changes from TFS


Trivial merge