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