Merge branch '1.4.x'

Conflicts:
	src/smt/model_postprocessor.cpp