testing
Merge remote-tracking branch 'origin/4.0' into 4.0

Conflicts:
	application/controllers/Home.php