Merge pull request #5453 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Fri, 3 Jun 2016 16:10:15 +0000 (09:10 -0700)
committerMatt Ellis <matell@microsoft.com>
Fri, 3 Jun 2016 16:10:15 +0000 (09:10 -0700)
Merge changes from TFS


Trivial merge