Options now has more optionie goodness.
Merge remote-tracking branch 'origin/master'