Merge branch 'develop'
Bug fixes for PHP < 5.3.0