Merge pull request #1431 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Mon, 24 Aug 2015 19:49:34 +0000 (12:49 -0700)
committerJan Kotas <jkotas@microsoft.com>
Mon, 24 Aug 2015 19:49:34 +0000 (12:49 -0700)
Merge changes from TFS


Trivial merge