Merge branch 'master' into module-voip

Commit

10 years ago

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