Fixed PHP 5.4+ only features.
Merge origin/master