Merge branch 'master' into type
authorphillbush <phillbush@cock.li>
Fri, 8 Jan 2021 21:39:28 +0000 (18:39 -0300)
committerphillbush <phillbush@cock.li>
Fri, 8 Jan 2021 21:39:28 +0000 (18:39 -0300)

Trivial merge