Fix compability with PHP 5.5.x
Merge commit 'f8ebe01c2d202ab0c811402f753ea5dc7af0cf31' into develop