Merge branch '11537-keepproxy-loop'
authorTom Clegg <tom@curoverse.com>
Fri, 28 Apr 2017 16:59:08 +0000 (12:59 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 28 Apr 2017 16:59:08 +0000 (12:59 -0400)
closes #11537


Trivial merge