matrix-spec-proposals

7c2ccb1a - Merge remote-tracking branch 'origin/master' into markjh/swagger_examples