Added hard check on PHP 5.3.3+ before using PHP 5.3 stuff
Merge branch '2.8'