merge
Merge remote branch 'origin'

Conflicts:
	unit-tests/Extension/ExitDieTest.php