matrix-spec-proposals

21a40b31 - Merge branch 'master' into daniel/threepidinvites-2