Merge commit '443047125a6d174d12a5f2da1cf24a29ace766d1' into localization

Conflicts:
	src/solvers/sLR.ml