matrix-spec-proposals

47cf958b - Merge branch 'master' into module-im