Skipping addObjectResource() calls if PHP < 5.3
Merge branch 'develop'