Fixed support for PHP-5.3
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed support for PHP-5.3