Synced from master
Merge branch 'tmp' into dev/php5.3
Fill the commit msg automatically
Synced from master
Synced from master