matrix-spec-proposals

7cb91840 - Merge remote-tracking branch 'matrix-org/master' into travis/s2s/keys-swagger