Quality improvements to matrix and its test suite#21

omgm wants to merge 3 commits intorockbot:masterrockbot/vektor:masterfrom

omgm:Fork-for-improvements-to-matrix-and-testomgm/vektor:Fork-for-improvements-to-matrix-and-testCopy head branch name to clipboard