Bug 980413 - Options that are nil should default to true

Backport from a newer version of commander

[merge]