Updated array definition for PHP prior 5.4
Fix merge

Conflicts:
	task.php