MSC2240: Room version 6#2240

turt2live merged 5 commits intomastermatrix-org/matrix-spec-proposals:masterfrom

travis/msc/rooms-v6matrix-org/matrix-spec-proposals:travis/msc/rooms-v6Copy head branch name to clipboard