matrix-spec-proposals

4b7f308f - Merge pull request #1576 from turt2live/travis/s2s/key-mgmt