Synced from master
Synced from master
Fixed PHP 5.3
Synced from master
Synced from master