matrix-spec-proposals

8d6642aa - Merge branch 'master' into travis/msc/global-versioning