php 5.4: sync patch with rawhide