ServerShell extends Shell
Merge pull request #1357 from sime/servershell

ServerShell extends Shell