Merge branch '5416-ssl-proxy' refs #5416
authorTom Clegg <tom@curoverse.com>
Wed, 22 Apr 2015 18:27:23 +0000 (14:27 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 22 Apr 2015 18:27:23 +0000 (14:27 -0400)

Trivial merge