matrix-spec-proposals

c47fb12a - Merge branch 'master' into module-im