Merge pull request #4326 from dotnet-bot/from-tfs
authorMatt Ellis <matell@microsoft.com>
Thu, 14 Apr 2016 22:59:13 +0000 (15:59 -0700)
committerMatt Ellis <matell@microsoft.com>
Thu, 14 Apr 2016 22:59:13 +0000 (15:59 -0700)
Merge changes from TFS


Trivial merge