Added timeout for serialization of total response as well as individual results.
Merge remote-tracking branch 'origin/master'