rebase against upstream

Current version doesn't work against Debian unstable, while upstream master works just fine

Edited Apr 10, 2022 by David Heidelberg

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information