Merge branch 'develop' of github.com:casadi/casadi into develop
Merge branch 'develop' of github.com:ghorn/casadi into develop