Synced release branch from dev/php5.4
Synced release branch from dev/php5.4