Renamed shell.php to shell_template.php
Shell dispatcher: error handling enhancement.
Merge remote-tracking branch 'origin/master'
Removed duplicated test.