Fix PHP version < 5.4  issue
Merge branch 'develop'