optcomp 1.6

fixes for 4.02
Merge pull request #2057 from diml/master

optcomp 1.6