matrix-spec-proposals

6e3993ef - Merge remote-tracking branch 'matrix-org/master' into travis/preset-guests