Merge pull request #2544 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Sun, 10 Jan 2016 20:15:58 +0000 (12:15 -0800)
committerJan Kotas <jkotas@microsoft.com>
Sun, 10 Jan 2016 20:15:58 +0000 (12:15 -0800)
Merge changes from TFS


Trivial merge