pulling workbench_shell.py from the workbench_cli branch
Merge branch 'master' into workbench_cli