Merge remote branch 'upstream/master'
Merge branch 'upstream/master'
setTimeout should be static
add http connect timeout
Merge pull request #384 from aroth-fastprotect/topic-http-timeout

missing static for setTimeout and add connectTimeout