v0.9.1: Always show selects, even if it's only 1 choice.
Merge branch 'master' into release

* master:
  v0.9.1: Always show selects, even if it's only 1 choice.