Merge branch 'master' into 2751-python-sdk-keep-proxy-support
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:22 +0000 (14:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:22 +0000 (14:31 -0400)

Trivial merge