Merge branch 'xep-0300-fixup' into 'master'

XEP-0300: small fixes

See merge request !151
3 jobs for master in 2 minutes and 32 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #31873
docker
test

00:01:31

passed #31874
docker
test_integration

00:02:22

 
  Trigger
passed #31875
docker
trigger_poezio

00:00:09