Merge pull request #3117 from elfiesmelfie/virt_fix_option_parsing