Merge pull request #12438 from neheb/cons
authorRosen Penev <rosenp@gmail.com>
Thu, 18 Jun 2020 22:25:12 +0000 (15:25 -0700)
committerGitHub <noreply@github.com>
Thu, 18 Jun 2020 22:25:12 +0000 (15:25 -0700)
conserver: 8.2.5


Trivial merge