php 5.4: refresh patch (from upstream git)