matrix-spec-proposals

ef957b99 - Merge pull request #2341 from matrix-org/travis/spec/fix-2298