Fix accidental edit in previous commit
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'