Php55

Merge in php 5.5 development branch.