fix for older php
Merge branch 'develop' into 1.x-stable