Synced release branch from dev/php5.4