Merge branch 'master' into module-presence

Commit

10 years ago

Merge branch 'master' into module-presence Conflicts: specification/modules/presence.rst