Avoid using a feature not supported in PHP5.3
Merge branch 'pr/262' into 2.0.x