Fix bug 65299
Merge branch 'PHP-5.5'