Merge branch '3206-keepproxy-use-client-token' closes #3206
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 8 Jul 2014 14:08:26 +0000 (10:08 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 8 Jul 2014 14:08:26 +0000 (10:08 -0400)

Trivial merge