matrix-spec-proposals

92c85bda - Merge branch 'master' into templating