Merge branch '5476-connect-timeout-scale' closes #5476
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 17 Mar 2015 14:28:24 +0000 (10:28 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 17 Mar 2015 14:28:24 +0000 (10:28 -0400)

Trivial merge