Fixes for PHP 5.3
Merge remote-tracking branch 'refs/remotes/origin/master'