Bumped timeout to 4 seconds when converting an image to JPG
Merge pull request #912 from simong/912-gm

Intermittent Failure: GraphicsMagic