Bug fix - gd unable to create resource for some corrupt jpeg files
Merge branch 'release-1.x' into develop
cleanup for tests