matrix-spec-proposals

4485b2f0 - Merge branch 'master' into travis/server-name-join