Merge PHP 5.5