matrix-spec-proposals

5b722160 - Merge branch 'master' into daniel/threepidinvites