support php 5.4
support php 5.4
Merge branch 'feature/php5.4' into develop