Merge branch 'main' into 'm-shinder-master-patch-90567'
authorm-shinder <mihail@shinder.ml>
Sun, 26 Dec 2021 21:20:33 +0000 (21:20 +0000)
committerm-shinder <mihail@shinder.ml>
Sun, 26 Dec 2021 21:20:33 +0000 (21:20 +0000)
# Conflicts:
#   NEWS


Trivial merge