Fixed PHP 5.3 [ci skip]
Synced from master
Synced from master