matrix-spec-proposals

95fe2c3d - fix merge