#1174 error string improvement (2)
Merge branch 'issue_1171' of github.com:casadi/casadi into issue_1171

Conflicts:
	swig/python/__init__.py