And another one.

Conflicts:
	plugin.php