be compatible with PHP5.5 and 5.6
Merge branch 'feature/php-55' into develop