Merge pull request #1283 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Fri, 24 Jul 2015 20:58:53 +0000 (13:58 -0700)
committerJan Kotas <jkotas@microsoft.com>
Fri, 24 Jul 2015 20:58:53 +0000 (13:58 -0700)
Merge changes from TFS


Trivial merge