matrix-spec-proposals

197c36c5 - Merge remote-tracking branch 'matrix-org/master' into travis/better-errors