Merge origin/master

Conflicts:
	lib/PhSpring/Engine/InvokerConfig.php