last json tweaks to get haskell working again
Merge branch 'develop' of github.com:casadi/casadi into develop