Set timeout on http requests to 3 minute
Merge branch 'stable-develop' into develop