Merge pull request #2659 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 15 Jan 2016 01:36:06 +0000 (17:36 -0800)
committerJan Kotas <jkotas@microsoft.com>
Fri, 15 Jan 2016 01:36:06 +0000 (17:36 -0800)
Merge changes from TFS


Trivial merge