ccc
Merge branch 'hotfix1.2'

Conflicts:
	solveBigProblem.txt