Fix compile failure introduced by the fix for bug #46408.
Merge branch 'PHP-5.5'