Merge remote-tracking branch 'origin/master'

Conflicts:
	UnitTests/SolverTest.cs
	UnitTests/bin/Debug/UnitTests.dll
	UnitTests/bin/Debug/UnitTests.pdb
	UnitTests/obj/Debug/UnitTests.csprojResolveAssemblyReference.cache
	UnitTests/obj/Debug/UnitTests.dll
	UnitTests/obj/Debug/UnitTests.pdb