Improve the overall coverage
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	includes/Db.php