Merge branch 'master' into develop
Fixing for PHP < 5.3
Merge branch 'develop'