PHP 5.3.0 required
Merge branch 'develop'