php 5.5.14 + upstream patch for #67605