fix php 5.4
Merge branch 'hotfix/3.0.0dev3'