Merge branch 'matrix-divide' into bleeding