Shorter timeouts on connection trimming
Merge branch 'tmp_master'