matrix-spec-proposals

52f6496c - Merge branch 'master' into module-presence