Merge pull request #5123 from dotnet-bot/from-tfs
authorPat Gavlin <pgavlin@gmail.com>
Fri, 20 May 2016 19:57:58 +0000 (12:57 -0700)
committerPat Gavlin <pgavlin@gmail.com>
Fri, 20 May 2016 19:57:58 +0000 (12:57 -0700)
Merge changes from TFS


Trivial merge