fix error message to last addition
Merge remote-tracking branch 'origin/master'
second fix to setvarcombo
Merge remote-tracking branch 'origin/master'