Merge pull request #161 from copiousfreetime/maintenance/update-test-matrix