Merge origin/master

Conflicts:
	module/Application/src/Application/Db/DbConnection.php
Merge origin/master

Conflicts:
	module/Application/src/Application/Db/DbConnection.php