#1080 generate_options_doc.py update to renamed namespace
#1089 allow multiline strings in option parsing
Merge branch 'develop' of github.com:casadi/casadi into develop