matrix-spec-proposals

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