bug fix
Merge branch 'master' of https://github.com/grudy/m1ri

Conflicts:
	bench/m3d_mul_benchmark.c