Incorporate MSC1693
Incorporate MSC1693

This is largely blatant copy/paste from the MSC with some formatting done to tidy it up a bit.
matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc,matrix-org/matrix-doc