fix options parser for dialog
Merge remote-tracking branch 'master/master'