Linalg.merge.master

relevant changes:

https://github.com/jakobkroeker/M2/commit/6ee1e603509c1b37980a245b6ff29503ca1f3613