allow running shell plugin
Merge branch 'master' into run-shell-plugins

Conflicts:
	bootstrap.php