Merge origin/master

Conflicts:
	casadi.cpp