matrix-spec-proposals

d5e0115e - Merge branch 'master' into spec-restructure-modules