matrix-spec-proposals

2efadea5 - Merge branch 'master' into markjh/document_v1_rooms_api