matrix-spec-proposals

2a26597c - Merge branch 'old_master' into travis/msc/inline-widgets