Fix PHP 5.2 build in Travis
Merge branch '4960'