Merge remote-tracking branch 'origin' into php-5.5