Merge remote-tracking branch 'origin/master'

# Conflicts:
#	solver/src/main/java/org/chocosolver/solver/Solver.java