Allow multiple shells to be enabled.
21 files changed