Merge branch '11638-limit-conns'
authorTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 20:04:59 +0000 (16:04 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 8 May 2017 20:04:59 +0000 (16:04 -0400)
closes #11638


Trivial merge