Merge branch 'master' of git.dn42:wiki/wiki

DN42 Wiki (BURBLE-MNT) committed 2021-06-15 18:54:03 +0000 commit 172eb86d65de7f4fa1978f76dbd3198d98fb97ca