added timeouts to web_correct_response and web_response_time
Merge remote-tracking branch 'upstream/master'