matrix-spec-proposals

17a6a4c2 - Merge branch 'travis/c2s/fix-changelog' into client_server/release-r0.4.0