~theo/rebase

Merge branch 'master' of git.sr.ht:~theo/rebase
Do not follow this link