matrix-spec-proposals

cf13c899 - Merge branch 'dbkr/dont_line_wrap_rst' into dbkr/more_requesttokens