Fix PHP warning.
Merge branch 'develop'