Merge branch '5.4' into imagick-webp-optional
authorAlexander Ebert <ebert@woltlab.com>
Thu, 15 Jul 2021 11:00:14 +0000 (13:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 15 Jul 2021 11:00:14 +0000 (13:00 +0200)

Trivial merge