tag for 4.5.1
Merge 4.5

Conflicts:
	install.php