Fix code so that it works for PHP 5.3.
Merge branch 'php-5.3' into develop