matrix-spec-proposals

86c85aea - Merge remote-tracking branch 'matrix-org/master' into travis/c2s/3pid-binding