Add ability to specify server timeout
Merge remote-tracking branch 'PeerJ/AddServerTimeout'

Conflicts:
	DependencyInjection/Configuration.php