matrix-spec-proposals

8632ddbc - Merge branch 'old_master' into travis/msc/inline-widgets