Small PHP 5.3 array fix
Merge branch 'develop'