matrix-spec-proposals

72cdfa84 - Merge branch 'master' into travis/msc/integrations/base