Merge pull request #1781 from neoascetic/1690_fix_for_php53

Syntax fix for PHP 5.3 (#1690)
Merge branch 'master' into master-with-fixes