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

Intermittent Failure: GraphicsMagic
Merge pull request #925 from stuartf/connect3

Connect 3.0.0. error
Merge branch 'master' into emailaggregation

* master:
  fix compatibility with connect 3.0.0
  Bumped timeout to 4 seconds when converting an image to JPG