From 2891cafc1de42db0182754367527aeec15f5a4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <krlmlr+r@mailbox.org>
Date: Sat, 31 Oct 2020 05:14:10 +0100
Subject: [PATCH] Merge branch 'master' into docs