Merge "Fix a PHP 5.5 TODO"