Update php54 with 55 changes