Fix PHP 5.3 compat issues
Merge branch 'develop'

* develop:
  Fix PHP 5.3 compat issues