merged changes from dev
Merge branch 'master' of https://github.com/ktroach/scriptcs-repl-command-infra