matrix-spec-proposals

00de03bd - Merge remote-tracking branch 'origin/travis/msc/wk-before-srv' into travis/msc/wk-before-srv