Update
Merge remote-tracking branch 'origin/debugging-xfactor' into debugging-xfactor

Conflicts:
	critexp.m
	diffsolver.m