Merge branch 'master' of git.autistici.org:ai/website into magutt

1 job for magutt in 3 minutes and 34 seconds (queued for 2 seconds)