matrix-spec-proposals

e75b22ba - Merge pull request #944 from turt2live/travis/summer-2017-sync