#1083: workaround for numpy bug
Merge branch 'develop' of github.com:casadi/casadi into develop