matrix-spec-proposals

cdd48e2a - Merge branch 'master' into travis/widgets