Correct Gateway class so that it uses the user defined timeout variable, not 1
Merge branch 'integration' of git://github.com/symphonycms/symphony-2
Merge branch 'integration' of git://github.com/symphonycms/symphony-2 into integration
Allow Providers to work on PHP5.2 (temporary 2.3.x fix). Closes #1709