* Changed array due to PHP version.
Merge branch 'develop'