Fix PHP 5.4 syntax.
Merge branch '4.0'