Merge f_in

Conflicts:
	newEmptyPHP99.php