matrix-spec-proposals

a4da7c8b - Merge pull request #1582 from turt2live/travis/general/fix-build-1