only work with long-named options (so that modules can use -m and -l options)
handle the case of a module without Options defined
Merge branch '1.1.0-fixes'