PHP 5.3 compat.
Merge branch '1.7' into 1.8