Merge branch 'master' into develop
Test fixes for PHP 5.2
More PHP 5.2 test fixes
Merge branch 'develop'