matrix-spec-proposals

f26f663f - Merge branch 'master' into drafts/e2e