matrix-spec-proposals

dd941447 - Merge remote-tracking branch 'matrix-org/master' into travis/cors