Merge pull request #701 from bunlongheng/fix/missing-http-timeout