merge for php5.4.16