Merge branch 'riastradh-20181220-closentry-v12'
authorTaylor R Campbell <campbell@mumble.net>
Fri, 16 Aug 2019 05:02:00 +0000 (05:02 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Fri, 16 Aug 2019 05:02:00 +0000 (05:02 +0000)

Trivial merge