make clear matlab optimizer maintains state
Merge branch 'master' into matthias-fix